viewSelector: always reset search string when entering overview

Instead of relying on the apps button callback to do it for us.

https://bugzilla.gnome.org/show_bug.cgi?id=693974

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 85ff6156d18d25e83302127b2577e186e6893677..de9237bea402777d0fc2c16eda16e83a444ebaff 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -161,6 +161,7 @@ const ViewSelector = new Lang.Class({
     show: function() {
         this._activePage = this._workspacesPage;
 
+        this.reset();
         this._appsPage.hide();
         this._searchPage.hide();
         this._workspacesDisplay.show();
@@ -244,11 +245,8 @@ const ViewSelector = new Lang.Class({
     },
 
     _onShowAppsButtonToggled: function() {
-        if (this._searchActive)
-            this.reset();
-        else
-            this._showPage(this._showAppsButton.checked ? this._appsPage
-                                                        : this._workspacesPage);
+        this._showPage(this._showAppsButton.checked ? this._appsPage
+                                                    : this._workspacesPage);
     },
 
     _resetShowAppsButton: function() {